From abc0f67cf6d3c3e8fee1109bbf166bb35ee1a1b4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Thu, 11 Jan 2018 11:58:05 +0100 Subject: [PATCH] main: Set event user data earlier event_widget is not modified anymore after the assignment from handle_pointing event and we need the event's user data set for the _gtk_window_check_handle_wm_event call. --- gtk/gtkmain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 94787f552c..c0e299f180 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1713,6 +1713,8 @@ gtk_main_do_event (GdkEvent *event) if (!event_widget) goto cleanup; + gdk_event_set_user_data (event, G_OBJECT (event_widget)); + window_group = gtk_main_get_window_group (event_widget); device = gdk_event_get_device (event); @@ -1753,8 +1755,6 @@ gtk_main_do_event (GdkEvent *event) if (check_event_in_child_popover (event_widget, grab_widget)) grab_widget = event_widget; - gdk_event_set_user_data (event, G_OBJECT (event_widget)); - /* If the widget receiving events is actually blocked by another * device GTK+ grab */ -- 2.30.2